From 8db1a082bc695d71af2b69313d026ab14c96f288 Mon Sep 17 00:00:00 2001 From: Yang Hongyang Date: Mon, 13 Jul 2015 16:45:45 +0800 Subject: [PATCH] tools/libxl: Update libxl_domain_unpause() to support qemu-xen Currently, libxl_domain_unpause() only supports qemu-xen-traditional. Update it to support qemu-xen. We use libxl__domain_resume_device_model to unpause guest dm. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 312e2619ad..ff0d616637 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1013,8 +1013,6 @@ out: int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) { GC_INIT(ctx); - char *path; - char *state; int ret, rc = 0; libxl_domain_type type = libxl__domain_type(gc, domid); @@ -1024,14 +1022,11 @@ int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) } if (type == LIBXL_DOMAIN_TYPE_HVM) { - uint32_t dm_domid = libxl_get_stubdom_id(ctx, domid); - - path = libxl__device_model_xs_path(gc, dm_domid, domid, "/state"); - state = libxl__xs_read(gc, XBT_NULL, path); - if (state != NULL && !strcmp(state, "paused")) { - libxl__qemu_traditional_cmd(gc, domid, "continue"); - libxl__wait_for_device_model_deprecated(gc, domid, "running", - NULL, NULL, NULL); + rc = libxl__domain_resume_device_model(gc, domid); + if (rc < 0) { + LOG(ERROR, "failed to unpause device model for domain %u:%d", + domid, rc); + goto out; } } ret = xc_domain_unpause(ctx->xch, domid); -- 2.30.2